Merge remote-tracking branch 'origin/master' into feature/android

diff --cc configure.ac
index e6a8c760b105c068a55815b7407e3ce022fbaa35,b484ebdc8bac73a96ce61aaf236373ee0155ae31..4aa8945b8baba9107cf0f77cf0206d6f288bff11
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -7419,7 -6637,7 +7419,8 @@@ AC_DEFINE_UNQUOTED([EMACS_CONFIG_FEATUR
    [Summary of some of the main features enabled by configure.])
  
  AS_ECHO(["  Does Emacs use -lXaw3d?                                 ${HAVE_XAW3D}
 +  Does Emacs use Android?                                 ${ANDROID}
+   Does Emacs use the X Double Buffer Extension?           ${HAVE_XDBE}
    Does Emacs use -lXpm?                                   ${HAVE_XPM}
    Does Emacs use -ljpeg?                                  ${HAVE_JPEG}
    Does Emacs use -ltiff?                                  ${HAVE_TIFF}